From 7e92513debcf0c62999206e3675493470c4b4ead Mon Sep 17 00:00:00 2001 From: Yong Wen Chua Date: Wed, 14 Feb 2018 09:58:20 +0800 Subject: [PATCH] Fix DocOpt deserialization type bounds This is wrt https://github.com/docopt/docopt.rs/pull/222 DocOpt does not support deserializing borrowed types. This change was reverted in https://github.com/docopt/docopt.rs/commit/7292a374e69afb192bb7aaa00f9d9f4afebc200d because it broke crates like Cargo etc. --- src/cargo/lib.rs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cargo/lib.rs b/src/cargo/lib.rs index d60792c7a..41615e3d8 100644 --- a/src/cargo/lib.rs +++ b/src/cargo/lib.rs @@ -40,7 +40,7 @@ extern crate core_foundation; use std::fmt; -use serde::Deserialize; +use serde::de::DeserializeOwned; use serde::ser; use docopt::Docopt; use failure::Error; @@ -103,7 +103,7 @@ impl fmt::Display for VersionInfo { } } -pub fn call_main_without_stdin<'de, Flags: Deserialize<'de>>( +pub fn call_main_without_stdin( exec: fn(Flags, &mut Config) -> CliResult, config: &mut Config, usage: &str, -- 2.30.2